Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 3 May 2011 05:47:50 +0000 (22:47 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 3 May 2011 05:47:50 +0000 (22:47 -0700)
commit233705400ff20bd2e3a3023d0f29b6b5cd7d9298
treece07246e84e631739600e1741bd18badeaa2217f
parentd09681b907b8fe8aa30bfa15f970feb446fc9852
parenta698999f2461174617443b7e5cfb0277df2c5218
Merge from mainline.
src/ChangeLog
src/lisp.h
src/sysdep.c